Merge branch 'master' into saroute

diff --cc CMakeLists.txt
Simple merge

diff --cc GPSBabel.pro
Simple merge

diff --cc reference/format0.txt
index 358f68b9e1ed7e04e5bfd06e4a0a7492d8e6e402,bab7cd80080bf086d5d6bb60b6337595afb09642..2c26225124672334e3d3f844cba1631da726676d
--- 1/reference/format0.txt
--- 2/reference/format0.txt
+++ b/reference/format0.txt
@@@ -4,25 -4,15 +4,18 @@@ v900          Columbus/Visiontac V900 files (.c
  csv           Comma separated values
  iblue747      csv     Data Logger iBlue747 csv
  iblue757      csv     Data Logger iBlue757 csv
- gpl   gpl     DeLorme GPL
  saplus                DeLorme Street Atlas Plus
 -saroute       anr     DeLorme Street Atlas Route
 +destinator_itn        dat     Destinator Itineraries (.dat)
 +destinator_poi        dat     Destinator Points of Interest (.dat)
 +destinator_trl        dat     Destinator TrackLogs (.dat)
 +easygps       loc     EasyGPS binary format
  exif  jpg     Embedded Exif-GPS data (.jpg)
- energympro    cpo     Energympro GPS training watch
- enigma        ert     Enigma binary waypoint file (.ert)
  shape shp     ESRI shapefile
- f90g  map     F90G Automobile DVR GPS log file
  igc           FAI/IGC Flight Recorder Data Format
  garmin_fit    fit     Flexible and Interoperable Data Transfer (FIT) Activity file
- flysight      csv     FlySight GPS File
  gpssim        gpssim  Franson GPSGate Simulation
- fugawi        txt     Fugawi
  garmin301             Garmin 301 Custom position and heartrate
  garmin_g1000  csv     Garmin G1000 datalog input filter file
- glogbook      xml     Garmin Logbook XML
  gdb   gdb     Garmin MapSource - gdb
  garmin_txt    txt     Garmin MapSource - txt (tab delimited)
  garmin_poi            Garmin POI database

diff --cc reference/format1.txt
index eff0629bb30feca08ca2d523104749e34608d0a4,26bee2d8d35fc14efd335d97445f46f811b6d2e5..db7e42f2b06fcf0573401112b82fa9a2914986e6
--- 1/reference/format1.txt
--- 2/reference/format1.txt
+++ b/reference/format1.txt
@@@ -7,25 -7,15 +7,18 @@@ file  csv             Comma separated value
  internal      custom          Custom "Everything" Style
  file  iblue747        csv     Data Logger iBlue747 csv
  file  iblue757        csv     Data Logger iBlue757 csv
- file  gpl     gpl     DeLorme GPL
  file  saplus          DeLorme Street Atlas Plus
 -file  saroute anr     DeLorme Street Atlas Route
 +file  destinator_itn  dat     Destinator Itineraries (.dat)
 +file  destinator_poi  dat     Destinator Points of Interest (.dat)
 +file  destinator_trl  dat     Destinator TrackLogs (.dat)
 +file  easygps loc     EasyGPS binary format
  file  exif    jpg     Embedded Exif-GPS data (.jpg)
- file  energympro      cpo     Energympro GPS training watch
- file  enigma  ert     Enigma binary waypoint file (.ert)
  file  shape   shp     ESRI shapefile
- file  f90g    map     F90G Automobile DVR GPS log file
  file  igc             FAI/IGC Flight Recorder Data Format
  file  garmin_fit      fit     Flexible and Interoperable Data Transfer (FIT) Activity file
- file  flysight        csv     FlySight GPS File
  file  gpssim  gpssim  Franson GPSGate Simulation
- file  fugawi  txt     Fugawi
  file  garmin301               Garmin 301 Custom position and heartrate
  file  garmin_g1000    csv     Garmin G1000 datalog input filter file
- file  glogbook        xml     Garmin Logbook XML
  file  gdb     gdb     Garmin MapSource - gdb
  file  garmin_txt      txt     Garmin MapSource - txt (tab delimited)
  file  garmin_poi              Garmin POI database

diff --cc reference/format2.txt
index 79de41b509f1c39797f3f75575d3ad50bd67653b,ad23fc941ea5d6a5847edf96842520e6e243f81a..4d7644aa209b7f6d2af169c962651ea772e9c213
--- 1/reference/format2.txt
--- 2/reference/format2.txt
+++ b/reference/format2.txt
@@@ -7,25 -7,15 +7,18 @@@ file  rw----  csv             Comma separated value
  internal      rw----  custom          Custom "Everything" Style
  file  --rw--  iblue747        csv     Data Logger iBlue747 csv
  file  --rw--  iblue757        csv     Data Logger iBlue757 csv
- file  --rw--  gpl     gpl     DeLorme GPL
  file  rw----  saplus          DeLorme Street Atlas Plus
 -file  --r---  saroute anr     DeLorme Street Atlas Route
 +file  ----rw  destinator_itn  dat     Destinator Itineraries (.dat)
 +file  rw----  destinator_poi  dat     Destinator Points of Interest (.dat)
 +file  --rw--  destinator_trl  dat     Destinator TrackLogs (.dat)
 +file  rw----  easygps loc     EasyGPS binary format
  file  rw----  exif    jpg     Embedded Exif-GPS data (.jpg)
- file  --r---  energympro      cpo     Energympro GPS training watch
- file  ----rw  enigma  ert     Enigma binary waypoint file (.ert)
  file  rwrwrw  shape   shp     ESRI shapefile
- file  --r---  f90g    map     F90G Automobile DVR GPS log file
  file  --rwrw  igc             FAI/IGC Flight Recorder Data Format
  file  -wrw--  garmin_fit      fit     Flexible and Interoperable Data Transfer (FIT) Activity file
- file  rw----  flysight        csv     FlySight GPS File
  file  -w-w-w  gpssim  gpssim  Franson GPSGate Simulation
- file  rw----  fugawi  txt     Fugawi
  file  rw----  garmin301               Garmin 301 Custom position and heartrate
  file  --rw--  garmin_g1000    csv     Garmin G1000 datalog input filter file
- file  --rw--  glogbook        xml     Garmin Logbook XML
  file  rwrwrw  gdb     gdb     Garmin MapSource - gdb
  file  rwrwrw  garmin_txt      txt     Garmin MapSource - txt (tab delimited)
  file  rw----  garmin_poi              Garmin POI database

diff --cc reference/format3.txt
index 56a2c2738b5ff8480bb158c1a79a3eaba56cc2e1,c59e776a8afaa74529ab5eb820e9415591360aa3..7be292ff72f3d57954fa843848db8f7280ba1102
--- 1/reference/format3.txt
--- 2/reference/format3.txt
+++ b/reference/format3.txt
@@@ -134,14 -132,18 +132,15 @@@ option  saplus  prefer_shortnames       Use sho
  
  option        saplus  datum   GPS datum (def. WGS 84) string                          https://www.gpsbabel.org/WEB_DOC_DIR/fmt_saplus.html#fmt_saplus_o_datum
  
 -file  --r---  saroute anr     DeLorme Street Atlas Route      saroute
 -      https://www.gpsbabel.org/WEB_DOC_DIR/fmt_saroute.html
 -option        saroute turns_important Keep turns if simplify filter is used   boolean                         https://www.gpsbabel.org/WEB_DOC_DIR/fmt_saroute.html#fmt_saroute_o_turns_important
 -
 -option        saroute turns_only      Only read turns; skip all other points  boolean                         https://www.gpsbabel.org/WEB_DOC_DIR/fmt_saroute.html#fmt_saroute_o_turns_only
 -
 -option        saroute split   Split into multiple routes at turns     boolean                         https://www.gpsbabel.org/WEB_DOC_DIR/fmt_saroute.html#fmt_saroute_o_split
 -
 -option        saroute controls        Read control points as waypoint/route/none      string  none                    https://www.gpsbabel.org/WEB_DOC_DIR/fmt_saroute.html#fmt_saroute_o_controls
 -
 -option        saroute times   Synthesize track times  boolean                         https://www.gpsbabel.org/WEB_DOC_DIR/fmt_saroute.html#fmt_saroute_o_times
 +file  ----rw  destinator_itn  dat     Destinator Itineraries (.dat)   destinator_itn
 +      https://www.gpsbabel.org/WEB_DOC_DIR/fmt_destinator_itn.html
 +file  rw----  destinator_poi  dat     Destinator Points of Interest (.dat)    destinator_poi
 +      https://www.gpsbabel.org/WEB_DOC_DIR/fmt_destinator_poi.html
 +file  --rw--  destinator_trl  dat     Destinator TrackLogs (.dat)     destinator_trl
 +      https://www.gpsbabel.org/WEB_DOC_DIR/fmt_destinator_trl.html
 +file  rw----  easygps loc     EasyGPS binary format   easygps
 +      https://www.gpsbabel.org/WEB_DOC_DIR/fmt_easygps.html
+ 
  file  rw----  exif    jpg     Embedded Exif-GPS data (.jpg)   exif
        https://www.gpsbabel.org/WEB_DOC_DIR/fmt_exif.html
  option        exif    filename        Set waypoint name to source filename    boolean Y                       https://www.gpsbabel.org/WEB_DOC_DIR/fmt_exif.html#fmt_exif_o_filename

diff --cc reference/help.txt
Simple merge

diff --cc vecs.cc
Simple merge